From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 6 Dec 2009 23:27:55 +0000 (+0000)
Subject: * vc-bzr.el (vc-bzr-annotate-command): Handle the case where the
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~9035
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=ba450add22b7e5f7db4c51dca36b2d2d71d3359a;p=emacs.git

* vc-bzr.el (vc-bzr-annotate-command): Handle the case where the
author field is too short.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a85d649162c..59eb1b4447b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-06  Óscar Fuentes  <ofv@wanadoo.es>
+
+	* vc-bzr.el (vc-bzr-annotate-command): Handle the case where the
+	author field is too short.
+
 2009-12-06  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* vc-git.el (vc-git-print-log): Handle a limit argument.  Display
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index 233cdb171ee..70989ee56e7 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -574,7 +574,8 @@ property containing author and date information."
 	       (unless tag
 		 (setq tag
 		       (propertize
-			(concat rev " " (substring author 0 7))
+			(concat rev " " (substring (concat author "       ")
+						   0 7))
 			'help-echo (format "Revision: %d, author: %s, date: %s"
 					   (string-to-number rev)
 					   author date)